From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 4 Apr 2013 15:35:50 +0000 (-0400)
Subject: shellEntry: Destroy entry menus when the entry actors are destroyed
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4370
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=14189e6827057b39a6174978c765ab02b05b7e19;p=gnome-shell.git

shellEntry: Destroy entry menus when the entry actors are destroyed

This ensures that a menu and manager aren't sticking around.

https://bugzilla.gnome.org/show_bug.cgi?id=697295
---

diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
index 61e43a9e3..2256af070 100644
--- a/js/ui/shellEntry.js
+++ b/js/ui/shellEntry.js
@@ -171,4 +171,10 @@ function addContextMenu(entry, params) {
     entry.connect('button-press-event', Lang.bind(null, _onButtonPressEvent, entry));
 
     entry.connect('popup-menu', Lang.bind(null, _onPopup, entry));
+
+    entry.connect('destroy', function() {
+        entry.menu.destroy();
+        entry.menu = null;
+        entry._menuManager = null;
+    });
 }